Remove visitor & company spec prefix; Add new specs