Project and some types renamed