Fix possible CME and rename some methods