Rename to follow OL3 rule