Updated readme and some internal naming conventions