Update main.cpp

some preparational renamings