Cleaned naming