Updated readme to use new naming conventions.