Clean up old naming convention