Cleaned up naming

Cleaned up naming