Bugfix for last commit + terminology correction