File renaming to avoid confusion

This pull-request relates to https://issues.jboss.org/browse/AGPUSH-1021