rename and bugfixes