refactor names to dot, simpler