updated naming conventions

Merged Chad Malchow requested to merge sop into master

@francisaquino please review the changes and if you approve, let me know.