Switch to Buildername for Analysis

Switched to buildername as arguement to process entries for
analysis. Using buildername allows for simplifying a lot of
the code and handles a lot of the corner cases that could have
arisen.