Bug fix
Changed class names for better legacy support
Rework & test fixes