Fixed a few bugs (duplicate names)