Add more rebranding, also I accidently a part of configure.