rename bad names for clarifications