Fix import / export services naming