Fix some naming.
Fix some rather serious bugs in value object and bump.