Changed naming to Imint standard