Rename some classes, refactor heights, improve native mimicry.