Implement more developed naming strategy