Make extension name generic