Standardized Naming

Added docs
Fixed potential namespace collison, and reduced pollution