Consistent naming
Updated YapDatabase to 4.2.1