Tidy up on addon namings