[src] Changing nomeclature of api to reflect actual operations