Cleaned up more struct names