Changes to fit my personal naming style