renaming + bugfixing