Some compile name changes