naming convention and other updates
updated copyright