Unifying controller naming around 'type'.