Bugfix: Rename for std. compliance