Naming identifiers hw updated