small renaming for conventions