Cleanups and some renaming