Funcnames refactored.