Some naming changes in order to make the code less wide