Update README to reflect changes, change some functions names to keep style consistent.