Added the possibility to rename the Tables which are used