Modified Base Features to follow proper naming conventions