Normalize names and parameterize internal state