Renamed method to avoid unintentional overriding of base class method

Change-Id: Ib879dc677d027ce88c31b02f15506964ecec8ec1
Fixed warnings about type conversion

Change-Id: I617311d64a0f1a326ec2fbaea6740810c49763e5