cleaned up naming convention
license update