refactor namings