Topic environment singleton rename clean

Hi all, 
I tried to clean up the mess from yesterday. So i went to the code again and fixed my wrong changes, made it compile with the Compile Suite and now i', hoping i did it right.