bugfix renaming, cleanup