re-word stuff in /code, and remove prefix from config