Cleanup, some renaming