1. More consistent names
1. More renames