refactor graph class names
normalized variables