Clean up, revised naming