bugfix + renaming