Move numeric name declarations to their appropriate places