[REFAC] Fix naming discripency