Name changes for compilation