Drop quotes around names consistently