Some changes in naming conventions, so as to be intuitive