Modify to respect naming convention