Implemented change of terminology requested in #41