Small fix to prevent naming issues