Added very basic naming conventions