Changed names to better ones (smaller)