Implement short house names in line with design