ADEN-626 change methods names