Merge "Renamed methods for clatification"