Fixed naming discrepancies between libary and source files