fixed schemaName changes to pass tests