Fix build and rename