Refactor from rsge to rsched naming convention