Fix to respect naming convention