Fixed inconsistend naming