Consistent naming scheme (compare to README) and also generalize for other future additions