address class naming convention changes