try to restore some naming consistency