Changes to use a better terminology