more refactoring/renaming for Crytography code