Fixing naming conventions so that we can require 'rgigya' vs 'r_gigya'