Fix build and directory names