Rename, fixes, cleanup