Replaced assassin names with bad coding practices.
Fixed conflicts