wide renaming, and start work on HtpasswdAdapter