Update class and id naming conventions