renamed variable names as per android standard