Renamed include and library variables