Fixes, renaming