Yi - rename class and method name to make sense