Fix hard-coded schema names