Standardise naming convention