Fix: Naming and auto focus