Refactored names to make the mapper more distinguish from other object mappers.
Added unit test.