bugfixes after new names