Filename cleanup
fixed namespacing errors