To avoid confustion, naming changes have been done