Remove deprecated entry
Refactor - Update using emacs's coding convention regarding prefix name
for function