added naming conventions to remove warnings