Small changes
Implemented naming convention changes