changing to site name
removing @ characters from commands