Bugfix + renaming