This commit fixes some partial rename issues and as a result fixes the failing secure repository-hdfs tests. Signed-off-by: Rabi Panda <adnapibar@gmail.com>