Change naming convention and updat some in the README