cleaning out old cruft, renaming for consistency