some renaming and a guid issue