Naming and structural cleanup of OTPassword