Changed component naming scheme.