created and added initial naming conventions
merged in from remote