140822-iss002: rename some public functions