Little housekeeping and code renaming