Update name and conventions