Methods rename, updated a method implementation and related tests