Updated version, deleted other naming