Fixed prefixed/short name inconsistencies