more rename and static_assert's