Normalized some naming
Normalized naming conventions and increased text coverage