Undid old naming conventions