Updated Naming

Consistency :D
Fixes #145