rename and bugfix