More naming changes just to make it more clear