diff --git a/psipresentation.cls b/psipresentation.cls
index 05601a6..fc3115b 100644
--- a/psipresentation.cls
+++ b/psipresentation.cls
@@ -105,26 +105,26 @@ BoldItalicFont = *-Bold-Italic
 
 % title page
 
-\newcommand{\titletextleftedge}{0.056}
+\newcommand{\TPtextleftedge}{0.056}
 
-\newcommand{\titlelogowidth}{0.14}
-\newcommand{\titlelogoupperedge}{0.84}
+\newcommand{\TPlogowidth}{0.14}
+\newcommand{\TPlogoupperedge}{0.84}
 
-\newcommand{\titleboxheight}{0.27}
+\newcommand{\TPbottomboxheight}{0.27}
 
-\newcommand{\titleimageheight}{0.78}
+\newcommand{\TPimageheight}{0.78}
 
-\newcommand{\ypostitle}{4.65}
-\newcommand{\ypossubtitle}{3.8}
-\newcommand{\yposauthor}{1.1}
-\newcommand{\yposlocationdate}{0.75}
+\newcommand{\TPypostitle}{4.65}
+\newcommand{\TPypossubtitle}{3.8}
+\newcommand{\TPyposauthor}{1.1}
+\newcommand{\TPyposlocationdate}{0.75}
 
-\newcommand{\centerforwidth}{0.195}
-\newcommand{\centerforleftedge}{0.208}
-\newcommand{\centerforupperedge}{0.8615}
+\newcommand{\TPcenterforwidth}{0.195}
+\newcommand{\TPcenterforleftedge}{0.208}
+\newcommand{\TPcenterforupperedge}{0.8615}
 
-\colorlet{authorfont}{white}
-\colorlet{datefont}{white}
+\colorlet{TPauthorfont}{white}
+\colorlet{TPdatefont}{white}
 
 
 \defbeamertemplate*{title page}{PSI}[1][]
@@ -133,10 +133,10 @@ BoldItalicFont = *-Bold-Italic
 
     \ifx \inserttitleimage \empty
 
-      \colorlet{titlefont}{white}
-      \colorlet{subtitlefont}{white}
-      \newcommand{\logocolor}{white}
-      \newcommand{\titletextspace}{0.66}
+      \colorlet{TPtitlefont}{white}
+      \colorlet{TPsubtitlefont}{white}
+      \newcommand{\TPlogocolor}{white}
+      \newcommand{\TPtextspace}{0.66}
 
       \node[inner sep=0pt, anchor=south west] (bkg) at (-0.01, -0.01) {
         \includegraphics[height=\paperheight]{psipresentation/imgs/bkgs/\inserttitlecolor}
@@ -144,27 +144,27 @@ BoldItalicFont = *-Bold-Italic
 
     \else
 
-      \colorlet{titlefont}{black}
-      \colorlet{subtitlefont}{black}
-      \newcommand{\logocolor}{black}
-      \newcommand{\titletextspace}{0.43}
+      \colorlet{TPtitlefont}{black}
+      \colorlet{TPsubtitlefont}{black}
+      \newcommand{\TPlogocolor}{black}
+      \newcommand{\TPtextspace}{0.43}
 
-      \fill[\inserttitlecolor] (0, \titleboxheight\paperheight) rectangle ++(\paperwidth, -\paperheight); % bottom color box
+      \fill[\inserttitlecolor] (0, \TPbottomboxheight\paperheight) rectangle ++(\paperwidth, -\paperheight); % bottom color box
 
       \node[inner sep=0pt, anchor=west] (image) at (\paperwidth/2 + 5, \paperheight/2 + 5) {
-        \includegraphics[height=\titleimageheight\paperheight]{\inserttitleimage}
+        \includegraphics[height=\TPimageheight\paperheight]{\inserttitleimage}
       };
 
     \fi
 
-    \node[inner sep=0pt, anchor=south west] (psi-logo) at (\titletextleftedge\paperwidth, \titlelogoupperedge\paperheight) {
-      \includegraphics[width=\titlelogowidth\paperwidth]{psipresentation/imgs/logos/psi-logo-\logocolor}
+    \node[inner sep=0pt, anchor=south west] (psi-logo) at (\TPtextleftedge\paperwidth, \TPlogoupperedge\paperheight) {
+      \includegraphics[width=\TPlogowidth\paperwidth]{psipresentation/imgs/logos/psi-logo-\TPlogocolor}
     };
 
     \ifx \insertcenterfor \empty \else
-      \node[inner sep=0pt, anchor=south west] (centerfortext) at (\centerforleftedge\paperwidth, \centerforupperedge\paperheight) {
-        \rlap{\fontsize{6}{6}\selectfont\textbf{\textcolor{titlefont}{%
-          \parbox[t]{\centerforwidth\paperwidth}{%
+      \node[inner sep=0pt, anchor=south west] (centerfortext) at (\TPcenterforleftedge\paperwidth, \TPcenterforupperedge\paperheight) {
+        \rlap{\fontsize{6}{6}\selectfont\textbf{\textcolor{TPtitlefont}{%
+          \parbox[t]{\TPcenterforwidth\paperwidth}{%
             Center for \insertcenterfor%
           }
         }}}};
@@ -172,30 +172,30 @@ BoldItalicFont = *-Bold-Italic
 
     %TODO: make the following a command?
 
-    \node[inner sep=0pt, anchor=south] (titletext) at (\titletextleftedge\paperwidth, \ypostitle) {
-      \rlap{\huge\textbf{\textcolor{titlefont}{%
-        \parbox[t]{\titletextspace\paperwidth}{%
+    \node[inner sep=0pt, anchor=south] (titletext) at (\TPtextleftedge\paperwidth, \TPypostitle) {
+      \rlap{\huge\textbf{\textcolor{TPtitlefont}{%
+        \parbox[t]{\TPtextspace\paperwidth}{%
           \inserttitle%
         }
       }}}};
 
-    \node[inner sep=0pt] (subtitletext) at (\titletextleftedge\paperwidth, \ypossubtitle) {
-      \rlap{\large\textbf{\textcolor{subtitlefont}{%
-        \parbox[t]{\titletextspace\paperwidth}{%
+    \node[inner sep=0pt] (subtitletext) at (\TPtextleftedge\paperwidth, \TPypossubtitle) {
+      \rlap{\large\textbf{\textcolor{TPsubtitlefont}{%
+        \parbox[t]{\TPtextspace\paperwidth}{%
           \insertsubtitle{}%
         }
       }}}};
 
-    \node[inner sep=0pt] (authortext) at (\titletextleftedge\paperwidth, \yposauthor) {
-      \rlap{\footnotesize{\textcolor{authorfont}{%
-        \parbox[t]{\titletextspace\paperwidth}{%
+    \node[inner sep=0pt] (authortext) at (\TPtextleftedge\paperwidth, \TPyposauthor) {
+      \rlap{\footnotesize{\textcolor{TPauthorfont}{%
+        \parbox[t]{\TPtextspace\paperwidth}{%
           \insertauthor{}%
         }
       }}}};
 
-    \node[inner sep=0pt] (locationdatetext) at (\titletextleftedge\paperwidth, \yposlocationdate) {
-       \rlap{\footnotesize{\textcolor{datefont}{
-        \parbox[t]{\titletextspace\paperwidth}{%
+    \node[inner sep=0pt] (locationdatetext) at (\TPtextleftedge\paperwidth, \TPyposlocationdate) {
+       \rlap{\footnotesize{\textcolor{TPdatefont}{
+        \parbox[t]{\TPtextspace\paperwidth}{%
           \insertlocation, \insertdate%
         }
       }}}};