Updated naming to be consistent

Signed-off-by: Ryan Shrum <ryan@ehousestudio.com>