Changed naming convention
Small example change to comply with new naming
Missed one name change
Doc update