Additional code name fixes