Update general naming guidelines per RFC 430