re-organise constants for name files