Gsa bug fix and naming fix