$names refactored