Bugfix after refactofing and slight naming update.