Standardise controller naming.