Minor changes to names

Changed the naming structure of my wrappers and added documentation to
identify when they end