Renamed functions for less confusion.
0.2.0