Added proper naming to bundle