Rework the element naming to comply with manufactured code
Refresh the CFBam jars with the latest builds