Fix some schema names