More double name bugs fixed