fix prefix names and MDC errors