If you guys prefer the names in that way, I can update those. Is there any convention to follow regarding the naming? :)