Last commit broke unit tests. Fixing...
A bit of refactoring and renaming to prepare for the hot spot jit