Improve naming re: file path wrappers, etc.