Renaming types for clarity