Cleaned up naming a bit